[automerger skipped] Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce am: 296cec5c am: 611a55f0 -s ours am: 71a0c991 -s ours

am skip reason: Merged-In I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e with SHA-1 2cdad9f0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: I956c9f283213a450d2bd38371418d3b9fb1f2f29