aml_go_odp_330912000
Merge changes from topic "revert-2149712-SLROUUHDNB" into sc-v2-dev am: 886477fa93 am: e2035bf764

Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2154344

Change-Id: Ie39d043ca97c22697a4d18a220dd30c53a5230f2