Merge "Remove security vulnerability" am: 5f35ae5858

Original change: https://android-review.googlesource.com/c/platform/development/+/1783572

Change-Id: I574dbc272e9af002f408dfc70a9ca31ef21a9911