[automerger skipped] Merge "* DO NOT MERGE * Fixes crashes on Watch device." into oreo-mr1-cts-dev
am: b1e960a327  -s ours

Change-Id: I36b27a66afa512d89cfe461a29175a10079469fe