Merge "Revert "Update Window Extensions library APIs"" into tm-qpr-dev am: f9701b65

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



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