[automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828
am: 9ac493094e
-s ours
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee
is in history
Change-Id: Ia028c322526bcaf784be278b8097767f5019066d
This commit is contained in: