4d8019abf4
This reverts commit d27b65d4d0.
Also added boolean to values/ and values-v25/ and values-v26/
to enabled/disable the listener by API version.
Bug: 35443111
Bug: 33553066
Change-Id: I69465c720f3b3eca7ae2025e01c315720862bec8