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: I223aed76ae1be41cb97582c0fd02d3c4177e59e5