Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
am: 8f5c9de97e

Change-Id: I32322f1b788bf3a55d92425485d98b58f7b524c7