Merge changes I966312e0,Ie443f626 into tm-qpr-dev am: a96f8dd380 am: 2acbc9f982

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

Change-Id: Ic0303fea0814805514708dd197edde91017a5409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>