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

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

Change-Id: Ie89663e2f6d399038ef38b3af01af425e2711d46