Merge changes Ic5fdefe2,I32cbd027,I464d846c,Ie9ef8e2b,Ib7b02d5c am: e6ae7c629b am: 8834603a01

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

Change-Id: Ifa73b12a346a8640c29a5891e6634f6d3085225d