Merge "Let package of encryption be set by resolving information" into nougat-cts-dev