am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT)

* commit '36ef0792d28d2beb8eecb4547fab81d520c66ed0':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)