Merge "Move DO protected packages to ActiveAdmin" into tm-dev am: c7458b44 am: 984e75e3

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



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