Merge "Update targetSdkVersion to 28"
am: 60fe2d90f1

Change-Id: I60d977e86004a1b50bd83f86eb908833bb4dcb44