[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 skip reason: subject contains skip directive

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



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