[automerger skipped] Merge "Check for secdiscardable file missing" into...

[automerger skipped] Merge "Check for secdiscardable file missing" into udc-dev am: 3e7585ed am: 042f2e80 -s ours

am skip reason: Merged-In If80fef0292d98ac3d53f7c4685afcaf742bbff2e with SHA-1 174f792e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21541123



Change-Id: I2ed00c308e65c49bb93db8d20155311a92941ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>