Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d am: b164b09cb1 am: c01e8b38b1 am: cc27840a54

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

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