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

Change-Id: I07e9841b959cc1332d51312671bbdfaaef844c7c