Merge changes from topic "AHB_format_r_16+" am: 112211eef1

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

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