Merge "support expanding advanced settings from intent extra"
am: 838bc45caf

Change-Id: I0bffecc244890abec5a8b4002c74f656fc8ed9cc