Merge "Update baseline profile." into udc-dev am: 66d85746 am: 3283ec4c am: 1ae47643

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



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