Merge "surface_control NDK: Track frameworks/native changes" into tm-qpr-dev am: 1d3ecebe6c am: 9f4876b6a6

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

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