[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours am: bb5558fe58
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10938446 Change-Id: I6d791a6180422d71ae27a829eaac49e1962db4c0
This commit is contained in: