Merge "Print human-readable OEM managed states" am: 9374ca2698 am: e71bec661e

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

Change-Id: I4ecc049acf7a5f2e3c99808c7e5f6c2f064d7e5c
tree: f689c0d07e020b46eb8554ddb7edb0d64a03d42d
  1. core/
  2. services/