Merge changes I36beff43,Iab7275b9 am: 503e12a866 am: 4d21078ab9 am: e71ef39842

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

Change-Id: I2ec3798e17b285a94a6462f8ff32e1f2c6d924af