Merge "Merge "Prevent error due to new API" into rvc-dev am: 5c4ad709 am:...

Merge "Merge "Prevent error due to new API" into rvc-dev am: 5c4ad709 am: a9577a3b am: 6588bfcd" into rvc-qpr-dev-plus-aosp am: a2d0de0a

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

Change-Id: Ia0833d4b20e6ba49c60f420f8da04591fa30abde