Merge "support expanding advanced settings from intent extra" am: 838bc45caf am: 5a67699e7e  -s ours
am: 1fd656cfeb  -s ours

Change-Id: I9fca5472d99f53a35559ed664c8e70845251638e