Merge changes Iff3cdebe,I9d1add4f am: 40e23904e3

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

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