Merge "Add missed break" am: e01bb41ad7 am: 6a860236e6

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

Change-Id: I418b1d529c40b687f4e2e1a895f993e49f215ac6