[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 53cbaca9be -s ours

am skip reason: Merged-In I3197f4ad998e02b58e10dd2fda2ae480550a7134 with SHA-1 deeabb75d3 is already in history

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

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