[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 f334fda89b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14124700
Change-Id: I090033139728cf8db322323c0b07664de8b59ec3
This commit is contained in: