Merge changes I47b4756d,I0564369e am: f486885133

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

Change-Id: I73665b6aaf439a8728b35553e6cbd3622d2ef4c6