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

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

Change-Id: I19be31d438bfcb203a6369ccac9da7a3e1f97351