Merge sc-v2-dev-plus-aosp-without-vendor@8084891 Bug: 214455710 Merged-In: I6eb7795a2fabfafa9ad96ec9612b737fc5cfb13f Change-Id: I5e80107e6d535f774a45ab2fc4f792f70702ee21