Merge "Avoid callback promotion in set" into tm-dev am: 1c8b09ab am: a9fc303e

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

Change-Id: I8c2b75be34d916b5e4a0d358d315a09416765f4f