[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a14 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id437dfe0647bb69e4124fd7d3f3ed1b973c14c7d