Merge changes I4c1e118c,Id66f2971 into tm-qpr-dev am: d6819393d2 am: 75e4894e8d

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

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