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

[automerger skipped] Revert "Update boot image and system server profiles [M20C15P70S...", RESTRICT AUTOMERGE Since these are profiles for T release only. am: 998a75e3 am: d8258132 -s ours am: 3c0f807a -s ours am: 696d84a9 -s ours

am skip reason: subject contains skip directive

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



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