Merge "Add missed break" am: e01bb41ad7 am: 918f4d24b7

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

Change-Id: I418b1d529c40b687f4e2e1a895f993e49f215ac6
tree: fe9c166a20d7a5c4a91b63d1942cddd0513d0eb6
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING