[automerger skipped] Merge "Revert "Update boot image and system server...

[automerger skipped] Merge "Revert "Update boot image and system server profiles [M20C15P70S...", RESTRICT AUTOMERGE Since these are profiles for T release only." into tm-qpr-dev am: 6ed71b90 am: d317709e -s ours am: 068e0087 -s ours am: 3cf51e2a -s ours

am skip reason: subject contains skip directive

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



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