[automerger skipped] Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e am: 5437a80536 am: 8ef20ea9c5 -s ours
am skip reason: Change-Id I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b with SHA-1 98678221fa is in history

Change-Id: I542dbaf8c20d98a31419381b86d8ed99fbed13f6