Merge "Prevent error due to new API" into rvc-dev am: 5c4ad7091e am: 541a010b1d am: 2e48ac0236
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817532 Change-Id: I68d58855fa058e07abe307f08e2f989449d271fe
This commit is contained in: