Add missing commits from xenial_-_android9 branch
requested to merge personal/peat-psuwit/missing-patches-from-xenial-xenial-android9 into ubports/latest
The 2 commits come from xenial_-_android9 branch and should allow adding and removing context in system settings. Note that the combined context part of this MR is moved to another MR to allow just this part to get in first.
Edited by Ratchanan Srirattanamet