Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev am: 301663a61b
am: 27521581fb

Change-Id: I8b0443ccf4a876b4de0d6de6d1af7909a4dee00e