Merge changes I0b129ec3,I49a5aee1 am: d34c7307f6

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

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