Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev am: e3436580

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



Change-Id: I70c4611a58ece65a6c494f2afcbeab0ab57cdd65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>