Merge "Ensure updates to the trace buffer size are synchronized" into udc-qpr-dev am: 9a76001d

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



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