Merge "Revert "Update boot image and system server profiles [M20C15P70S...",...

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

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



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