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