Merge "Re-increase the Extensions API version change" into tm-qpr-dev am: a50b5fcba3 am: ba796f53c5

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

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