GitLab

Test: Built and Run with Android N(on Cast Master) changes (Cast + setup) on the AT1
Bug: 118437285
Change-Id: Iff72a2a2d8eabda619940a256bab1b23daf00c26
Reviewed-on: https://chromium-review.googlesource.com/c/1331579
Commit-Queue: Elvin L <elvin@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608393}