Merge "Avoid triggering support dialog in non-current user." into nyc-dev
am: 5548733eb5

* commit '5548733eb5163ef9f3c642314d2d217503c90d64':
  Avoid triggering support dialog in non-current user.

Change-Id: I243f2699a5840294e0de9efc5e95011fd83dca37