Merge "Bump target level to 3" am: 53a7a51d35 am: d05f5df031

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1468185

Change-Id: I996c1f3fa897b23ea222f6a0818d7e981e112b50