Merge "Update WM Ext aar to include java functional APIs" into tm-qpr-dev am: d57a2941

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



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