Merge "Fix quoting of paths in auth code." am: 096db1a1c6 am: f898aade18

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1363936

Change-Id: I28cf44911b232af339eb6f685fe5f8a3e7ef0641