Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f948e am: d0cd381a0b

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

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