Merge changes I61c84693,I929428f7 am: e6b79e2923 am: d00c6818dd am: 83bdc37516 am: c7ce11cd64

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

Change-Id: I36f0b3338f0f27be217d12258aed90438f7d297f