Merge "Fix wrong use if "!UserHandle.isApp()""