Merge "Browsing Phase Data Type to Store Information" into udc-dev am: ba90594b am: b006e9b3

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



Change-Id: I8994db2e782273b0dc83e8b79fae04f2122993da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>