[automerger skipped] RESTRICT AUTOMERGE am: 7b816129ba am: 6e97ce0e04 -s ours

am skip reason: contains skip directive

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

Change-Id: Ie17229ac8da3b5fea76c32db9b9cdd9c5d10c2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>