Android security 9.0.0 release 64
Add private enums.

This is cherry picked from ag/1380640 and ag/1483972.

Test: wayland_service builds.

Change-Id: I09eb7d8837c639a668a18545ab23cab2d7c6b751
1 file changed