Separate handling of a single path and a list of paths when determining am: 8701bf5f32

Original change: https://android-review.googlesource.com/c/platform/art/+/2962584

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