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

Change-Id: Ia6cd10ee5a8d78f6002874f69d08ed53a3013572