[automerger skipped] Add metalava dependencies am: 11927ae8f1  -s ours
am: 1b969332f6  -s ours

Change-Id: Ib70d38fe3c914fa62708bf3c16fcd30cc9c6aa7e