[automerger skipped] Merge "Add rkpd to the list of individually toggleable...

[automerger skipped] Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f am: 708b70a5 am: 3c79e802 -s ours

am skip reason: Merged-In Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c with SHA-1 95b54647 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2497575



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