Merge "Adopt shell permission only to set and unset time limit." into ub-launcher3-qt-dev
am: 4c8d7a0401

Change-Id: Id226c9a9acbc9f9daba7d5eccc6f6bf407649626