Merge "Bumping package version number for next release" am: 5643e1287f am: ff0db2c6df am: 9f00719873

Original change: https://android-review.googlesource.com/c/platform/development/+/2004902

Change-Id: I8227132fe9c8b7862f58b3d7c34a718d6c11c3cc