Merge changes If4e8ff72,I53d861fb am: 91496f424d am: b797b91fca am: cf992360dc

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

Change-Id: Icd0279b6d8fe6627aea5897b76f0500d9c4beb99