Merge changes from topic "am-f7daa49c-d3a5-4fd5-9a61-523ac89272b4" into ub-launcher3-master

* changes:
  [automerger] Fixing preference highlight when opening notification access am: d47f2d26cc
  Fixing preference highlight when opening notification access