tree 629930bf8ff487ae20b1453bb9d6ce71c3729fee
parent e3d7a5ca0d5b6755c9e00497521a39362c4ba211
parent 32a0ea311513a9bc11e8bb30e4fc13d00b9bcd5b
author Jonathan Miranda <jonmiranda@google.com> 1623770406 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1623770910 +0000

resolve merge conflicts of 32a0ea311513a9bc11e8bb30e4fc13d00b9bcd5b to sc-v2-dev-plus-aosp

Bug: 191109888
Bug: 181901105
Change-Id: Iabcb346f727082d6b4a5c67be653ea64ba45c223
Merged-In: Ia904b8b96301042c900e0589f33fc625c1c1148b