Merge "Print human-readable OEM managed states" am: a4587ab45f

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

Change-Id: I38380b1f6a80fdfbbcc21124470929530131fcdd
tree: 96c64c1989027a127a55ded58f7207881fbc6c12
  1. core/
  2. services/