Merge changes I3e156afa,Id7e4f2eb am: 116fa3048f

Original change: https://android-review.googlesource.com/c/platform/development/+/2513461

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