Merge "Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007 am: 9dee0bccd8" into nyc-mr1-dev-plus-aosp
am: 594e5455d3
* commit '594e5455d33c20278a8fc0a01cb0005bf0a9db86':
Change-Id: I9a304eda38e348109f0b251ff5148f3630341abe
This commit is contained in: