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: b14a1bf4

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



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