Merge changes I732f0e78,I7a8f668c,I1f439621,I55122a7b,I83c43497, ... am: d318d93dd5 am: bad1cba5f0 am: 0e38639186 am: 7ffb852738

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457564

Change-Id: I27cba4403a1b24ed4567a82783755ad8d2f4fed3