Merge changes I7315059b,If2dd13d8 am: 08b17a98a8

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

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