[automerger skipped] Merge "Update WM Ext aar to include java functional APIs"...

[automerger skipped] Merge "Update WM Ext aar to include java functional APIs" into tm-qpr-dev am: d57a2941 am: 509436e2 -s ours

am skip reason: Merged-In I846b2f2a07cc2ee2d4a3651d75ffe6b9a1a8770f with SHA-1 c32c2622 is already in history

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



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