Merge "Fix issue with" into rvc-dev am: a1596ea543 am: 89dc94eba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933639 Change-Id: If3d4570a85dabd138fddd3eff1e75f75984bdfa7
This commit is contained in: