Merge "Base implementation of WFC disclaimer UI"
am: 7e2c23aa0d

Change-Id: Ib89de5bf801b6669795e7c49010136a0e966324a