Merge "Fix onStateChanged issue." am: 61c3d559c8 am: f3b6f05c6a

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

Change-Id: I7f7bb85bf9d59acc9a0730da01b735c3d8751045