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

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

Change-Id: I477f89063adfacb1f94ea0bdc2e7b6f33f995b39