[automerger skipped] Merge "Re-increment reported WM Extensions version" into...

[automerger skipped] Merge "Re-increment reported WM Extensions version" into tm-qpr-dev am: 1920d7b9 am: c2b46367 -s ours

am skip reason: Merged-In Ic58e35140219fba3dc9a2cc5a9ec7372c5a0405c with SHA-1 bd8737c4 is already in history

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



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