Merge changes I6080fa7f,I3c0477cf,I0beac6e7 am: eccee76591

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

Change-Id: I1fcdcaa2f361093911ced03e5bdcfebf04eb3bca