Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: 9a93a1dbe9
am: 84586334b2

Change-Id: Ic2818dc965defb3b2df3192604cedbfcddf36714