Merge changes from topics "presubmit-am-2cdd826ba79049868e8caf3315eb6c80",...

Merge changes from topics "presubmit-am-2cdd826ba79049868e8caf3315eb6c80", "presubmit-am-417dfb9fcae14774a7ec06fd778d56c5" into tm-dev am: f9d386d1 am: a2fbfe90

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17038910

Change-Id: I861e3a34e10d0fe984d8e58afaf1c456d93ac8b7