Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev am: 257047b24b
am: 7c61bd0fbc

Change-Id: I835047c0d75422897080b6ced2447c1e6c734bc8