Revert^2 "Address frozen notification API feedback"

This is a clean revert. Previously the test failed because the kernel
has not been updated to support frozen notifications. Try rolling
forward again, this time merging the frameworks/base change first,
then waiting for kernel update before merging the CTS.

0b1fe74a

Change-Id: Id1deb6ea308658c0331859ac9b1ac695283e461b
API-Coverage-Bug: 367706442