Merge changes Ie8ff0e35,I4aebdb5e,I4d9b906f am: 270633f6ca am: 36ecd66b48

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

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