Fix invalid bubble predicate once and for all

Predicate to remove a bubble was returning true for pending intent
based bubbles & removing them accidentally.

Test: manual - 1) Use test app with pending intent based bubbles
               2) Add a bubble from the app, leave the app
               3) Open the app (causes shortcut change)
                 => bubble sticks around

               1) Use test app with shortcut based bubbles
               2) Add a bubble from the app, leave the app
               3) Open the app
               4) removeLongLivedShortcuts
                 => bubble removed
Bug: 159719877
Change-Id: Id17423718669f5b829988c43204941f5535980cd