Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e am: 5437a80536

Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784