This is a squashed import of these two commits from GrapheneOS: 2d95f1ee9e c297a079e4 Signed-off-by: Tad <tad@spotco.us>
2d95f1ee9e
c297a079e4