Merge upstream commit '6029c0575763ef237440a9bb7447a922eecf47fb' into master am: 8b4d56f505 am: 2fe5b84081 am: 440eae6d5f am: 1f7cc85b8e am: b64f9712e1

Original change: https://android-review.googlesource.com/c/platform/external/pandora/mmi2grpc/+/2168183

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