Merge changes from topic "AHB_format_r_16+" am: 112211ee am: 7f60bfb5 am: 3e2c8537

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



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