tree dd45806e40398d2a8e262b8605cf50a23d01c33f
parent 124db7847e82a8e8d6ad849b64f64abb05b2937f
parent eb3543b17fe6a5ec4c770a37798ba879b3fbc42e
author Chiachang Wang <chiachangwang@google.com> 1605858571 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605858571 +0000

Merge changes from topic "move_BSCH" am: eb3543b17f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503395

Change-Id: I1e27a7fcde0ba83ffcad525ca091af7fc5ced2db