Merge "Update TRANSIT_FIRST_CUSTOM to ensure custom transit values don't...

Merge "Update TRANSIT_FIRST_CUSTOM to ensure custom transit values don't change" into udc-dev am: 0baef534 am: 36631adf

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



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