Merge "Don't greylist public bridge methods."
am: 9229d6e84b

Change-Id: I3e415f903fa263bbbad87cb171fea45f6224f904