Merge "Cleanup: remove VNDK APEX exception from binder" am: dc267c5b3d am: c4048a594d am: a4abf8f72c

Change-Id: I534e0450c59c4dfd3997d456f94f7a4140e6165f