Merge "Fix onStateChanged issue." am: 61c3d559c8

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

Change-Id: Ie729ef7defddbe3fd55699480f6f3cf63d32b8c8