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

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

Change-Id: I3dfbe72b9c4cbefcf63edf22491e15caac81d26f