[automerger skipped] Merge "RESTRICT AUTOMERGE: Disable file compaction by...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Disable file compaction by default" into tm-qpr-dev am: fc6f9149 am: 025a23d2 -s ours am: 8b0319f9 -s ours

am skip reason: subject contains skip directive

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



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