Merge "Grant Shell ability to clear instant app" am: f5a0e41e18
am: 7282c21b57

Change-Id: I9cd6d8bad270bd25633dd851eb83a24cec16ce7b