[automerger skipped] Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into tm-dev am: 0e158d0440 am: 0ccbe27445 am: d3126dfaff am: 6d88b28bfb -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161336 Change-Id: Ic85106fbb06eecc9055f5f4f6988b12e9872bb4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: