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

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

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



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