Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev am: 2ea49fcb72 am: 6e428d5944 am: c973aeebf0 am: a7553da755
am: 6941880d63

* commit '6941880d639b4523914ef6e1e976af88059118b5':
  Runtime hint for android.adminhostside CTS test