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