[automerger skipped] Merge "[RESTRICT AUTOMERGE] Ignore test on old branch." into sc-dev am: ab3ebefd85 am: 2c94a7e245 -s ours am: 4b733e1a30 -s ours am: 825cb905ab -s ours

am skip reason: subject contains skip directive

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

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