Bug: 321300737 Bug: 315241296 Test: m . Ignore-AOSP-First: security Change-Id: I75f4a037c9a32c7db496363eeed66663844b7576