Merge changes I3a4a7562,I0af834d6,Ic486a932,I2ac1ca1f,Ib6782128, ... am: 2fac859332 am: 9a13c9a22a am: 239854ccd0 am: 872a0b874c

Original change: https://android-review.googlesource.com/c/device/sample/+/1879666

Change-Id: I46ac0daa951db4cc859c2ecdb7d2fbb1df326768