Merge changes I5d66c2b2,Ic11952e0 into rvc-qpr-dev am: 13c433a6 am: b619b4f5 am: 4ce4661f am: 16a2e498

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

Change-Id: Iedeed0910fdea946123654e2863d76e751ca6b92