Merge changes I36beff43,Iab7275b9 am: 503e12a866

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

Change-Id: I123077099e93450f6f24c02b1bd23e68d43b46b9