Merge "Remove security vulnerability" am: 5f35ae5858 am: 966db3f188

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

Change-Id: I2436d03d3c49bc5aae053822f5548b8241c24738