[automerger skipped] Merge "Base implementation of WFC disclaimer UI" am: 7e2c23aa0d am: 257e6f71ee
am: 770e610a77 -s ours
am skip reason: change_id I789f530d3e16baa6e56feaa4269f6696976f747e with SHA1 9fae73915c is in history

Change-Id: I19290040bf66d86354f83aa7854ee549cf54d50a