Merge "Fixing last CL (uploaded the wrong patch)" into rvc-dev am: 0edfd76f6f am: 66ae260c5e

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

Change-Id: I3a1519bf937d6300744aa668d1e3962e3b110d04